Proper types

Add types to fields of custom types, return proper types on remaining
GET functions