Added type abbreviations, fixes to semantics compset