Add back in some overwritten render pass code (whoops), fix a couple other render glitches.