Formatting, minor fixes.
WIP on converting to use RenderTarget [uncompilable]