small improvements for om