Some edits to datatypes