Refactored command line argument handling
Minor re-organizing
removed wriggle dependency
Minor refactoring