some clean up, game pips added