Added todo, minor change to collision.