Fix bugs related to winning and losing - still some to fix