Better handle disconnects and add colors