small fixes with collision-handling