Improved parser

Improved command-line parsing abilities.