lots of small fixes and chat
Merge remote-tracking branch 'origin/master'