More output in main program. Some tweaks to parameters.