Split off play by itself for clarity, fixed two minor bugs