minor fixes and cosmetics