Debug issues

Fixed Game according to proper rules
Merge Master to Leif