Fixed some commands and issues with the overlap between person and
friend.
Merge remote-tracking branch 'origin/master'