Nanny fixes and a device mach with identify capabilities