Completed the extraction of measures of interest, some fixes in alignment and improvements in exception handling.