Adds set_key and unset_key
Fixes whitespace