Small fixes + some helper functions for the --key and --value argument functions