Add initial errormarking.
Rename code reusing variable names.
Add experimental yubikey support.