* added error handling * workspace machine cleanup * renaming callback * general cleanup * fixed tests * PR comments