Cleanup and misc updates