password/group info, more refactoring