collision fixed up but need to fix some maps now