SI parsing bug fixed, names further augmented