end turn logic fixes