Lots of improvements to type and content