Cleaning up code

last edits of the evening, much more to go
code works, needs more features still to finish game