Main game logic updates

Need to fix bug in mark handling