Fixed bugs, dressed up html.