minor fixes and enahncements