clearer option keys and values; added demo