minor fixes and some additions