more complete times data
preparing to skip substages when not needed
.id file: be sure that the # is always alone on a line
code cleanup