fixed up rendering and loading bugs