minor edits
new DiscreteObservationType added

plus choice element for cont or discrete choice