More cleanup and added a goals page.