basic updates and cleanups throughout.