Changed loading strategy; minor bugfixes