Updated datatypes and other clean up