working test game functionality, other cleanup