lots of small fixes and chat