Fixes for square, no move yet..