better argument parsing
better argument parsing