Cleanup, fix depth/stencil buffer issue, but looks slightly worse