added missing files, improved capture-thing