Fixed argument parsing and added differentiation of human/machine readable names