Fixing chat
Remove some commented out code
Merge pull request #46 from dnc223/master

Chat fixes