Fill in arguments
Various Untested Improvements to Parse-args branch