removed test collision and cleaned up some things