Shaolin vs Wutang 2: Various tweaks and bug fixes

Various tweaks and bug fixes