several small cleanup items