improves names and adds user groups