Slight improvements to renderer

More on the way, still too slow