cleanup
fixed collision bug