added some pages, slight restructure