Added fix for None value, first move hack
Removed first move hack
Flurry of fixes, seems to be working