minor and misc updates