use snakeoil in add_key action; minor improvements