[IMP] improved soem code and typo