Bugfixes baseline
World 3 coming soon