Chat reenabled

A few other minor changes as well. Commit before digging into the code
again.