Resolved all major messaging and user bugs