Clean up and bug fixes
Added chat and messages