minor fixes and renames