cleaning things up and adding pages