minor fixes/cleanup/clarifications