Han's fixes for collision.c, updates by Bhavna

New collisional options added by Bhavna. Multiple bug fixes by Han
Uitenbroek.