Added chat and some little changes