Separated ops; provided "type-level" ops; minor fixes;