small changes
from bjack does not work, moving on
Merge branch 'people_groups' into testing