Fixed and added messaging and friend functions.
Merge branch 'friends'