main2013: Some tweaks