- fix prefix string
- wrap descriptions in <p> tags
- use opt_str() more
- fix formatting and some comments