Fixes

Fixed lots of minor mistakes.

Dialog still needs some work.