Shaolin vs Wutang 2: Various bug fixes and tweaks

Various bug fixes and tweaks, edited a few stages