A bunch of work - added some pages, tweaked stuff