Bug fixes, load time improvements