Added expert mode and highlighter.
Fixed piles of bugs and added some more.