Minor bugfix and updated content-types

Added most of the other content-types discussed in Ivan Ristic's paper
and fixed a minor bug where the label for an option wasn't fully
displayed.