Adding squares, and fixing 2 or 3 crashes