Added options command, fixed some tests to be insensitive...