various minor fixes and additions