More prettifying, and htmling