Bug fixes and adding value getter/setter and modelOptions.