Lots of tiny changes for better loading.