collision detection bug fixing + comments and stuff