bug fixes, wip chatting