Tracking movement of users + bug fixes
More bug fixes
Merge branch 'poojaedits2'