Fixed multiple collision bugs and glitches