minor fixes and changes