Changed data-types not on formal spec to classes

Also updated titlepage handling.