Refactored game and elm to be more sensible.
fix bugs from refactoring