Added chat and other fixes