mo fixes (by diraol) and mo generated