minor fixes, some additions