Can't choose attack if not enough AP. Other small changes