debugged, new pages, better look