Test, fix and adds for letherman