Some fixes:
- new meta-data fields
- formatting classes...