minor fixes/cleanup