collison bugfixes