gamelogic part1 of 999 & minor fixes