minor fixes and additions