added some pages but not bugfree