Typed some more stuff.