A whole lot of cleanup & tweaks.