Misc improvements and cleanups
29 files changed