Cleanup (needs fringe movement fixes)

Need extra constraints for knights and diagonal movement