minor fixes and details