KVS get/set (not tested)
Minor edits