fixed client_to_desktop and remove, plus some other stuff