More work on collisions

Fixed some bonehead mistakes in updating AABB information. Moved AABB
drawing routine to draw the actual ones used for the calculations. This
showed that the AABBs themselves were being protrayed properly, so there
is an issue with the update routine...