More Speed ups for loading and rendeirng