added some more type functionality
added some more type functionality