Bug Fix & Add Chat Support