Cleanup and minor changes / tweaks.