updated model, error handling, htmlQuestion wrapper
model files