Some improvements and first chat functionality