End turn event + fixes