changed 'people' to just be users, moved methods into controller, other little things