GameController is somewhat tested and corrected
Small changes