More cleanup + makings of an options page.