Code cleanup

Code correctness fixes, some small fixes.
Refactored HiScore into it's own class.