Small readability changes and first attempt at collision handling.  Did
not work, commented out.  Also slowed things down a little.