Fixed a lot of the loading of elements, much better performance and breaks more gracefully