data types, convenience module
rename functions
rename and some minor changes