fix random disconnects, renaming stuff