collision detecting mostly fixed, removed debug info