Various fixes and improvements to the greedy player