added city attr to user, fixed adding comments to activities

and some other things I don't have time to talk about