fix bugs from merge, game up and running again