Bug Fixes

Fixed a few bugs and extended chat support