cleanup, add libraries, add secondary pages