Misc updates and cleanup