Minor optimization, bug-fix in timing input, adjustment in XML