Bugfixing on collisions

Also, some test code for graphics.