Refactored classes to be 'right', fixed touches to where rook and knight can distinctly be picked up, etc