Made some improvements to  Single-Player version.