Added more pages, directives 'n stuff