some fixes and chat