made improvements to load time, etc...