Modified the TODO file.
Minor changes to argument parsing