more model data added
improve error messages