Super vs. World: Bugfix update

Bug fixes and some optimization