Fixed a lot of collision issues. Some problems still exist