added missing deletes, pathes, others