Improved play and minor corrections