un-compile tested changes to support more command line args