Code tidy-up and bug fixing.

Added more options, fixed bug with disappearing clue number, plus general code tidy-up.