Made some more changes to the square finder