Added Custom Chat + Some other bug fixes