Changed some chat logic and a couple other minor things