various fixes to first two pages