Update of sentinel spike

Works correctly on more devices, plus a few tidy ups.