Fixed some bad code that made its way back into NorseSquare.java. i think that it is being corrupted by old code that is somehow pushed back up, we should all check that we have the absolute latest code and have merged properly.