Updates to some pages and core.inc