fixes to match page and stuff