bug fix and cleaning
fix swap world and end collision crash