some minor fixes and changes