fixed some collision issues