Just a shitload more progress
Type and page tweaks