Fixed collision properly. All known collision bugs have been fixed