minor fixes, name changes...