24 main now propagates master and inputtype to game