End turn events + fixes