Doc and misc update