- Minor changes - prerequisite for new type system