polish game and fix errors