some minor work on datatypes
mergeconflict resolved