Some more cleaning
Adds ability to guess, undo guesses, syntax highliting for guesses, etc.