Fixed CM bug and added player turn restrictions