Improvements to renderer