Added chat windows, and some clean up.