Make types stricter and more complete

[gakonst]

Currently a lot of types are omitted because they're not important for the usecase or their type is set to String. We should make these more accurate.