Swap invalid turn alerts for popups

(and fix a small bug affective the first move)