more cleanup, refactoring of the ui, working a little on debugging game