Some fixes according to the 'lockpicking'-paper and input from http://www.proxmark.org/forum/viewtopic.php?pid=10981#p10981