Improved game class, made associated modifications in other classes