1 loading improvements

Incorporate Ryan's improvements to the loading process.