Adding the rest of the type information, and some other cleanups