Added more foriegn key fixes and more data types showing