Small fixes, some more configuration for chat and a tad bit of cleanup.