misc fixes
user to be able to message each other
git merge dev