typo fixed
rethink and clean up all the rendering context stuff