some minor fixes and additions