General cleanup, renderer renders into the correct buffer now