Clean up key handling
Tweak readme