minor fixes, trivial additions