More Cleanup.

Removed some old region flags
Brought comments in line with upstream
Small amounts of sunshine and render prep