loading tweaks and various bugfixes