Minor updates.

TODO: Merge and finish abstracting collision.