changes to match page, and lots of stuff