expanded data types into a more (totally?) complete list