bugfixing, SSOM improvements