Finished game functionality
minor clean up and bug fixes