A few more minor formatting fixes. Basic concept works.