two new pages and some clean up