Variable answer types
Fix a couple typos
Short labels
Merge pull request #17 from puls/puls/answer-types

Variable answer types