all: collision code now fine, cleaned up alot