various corrections to semantics