minor fixes/improvements