integrate new OID
add rvalue comment
moar tests