Minor fixes to cavalcade, limited player win implemented