Some fixes
Fixing activity problems
Merging with my people