missing options fix, tests passing