Tested and fixed collision. Minor changes.