Added prefix default argument to commmand line parser
Minor changes to templates based on testing