fixed stuff w/ chat