Typing improvements

[maritz]

There are still quite a few things that aren't perfectly typed or even completely untyped.

Any ideas or discussion about that should go in this issue.