Better collision detection. That took me waaaay too long... :P