Mark some piece columns as non-null
Remove unnecessary comments
Add count to stones
WIP