minor fixes and tweeks