more improvements on 40x pages