fixed minor issues in Model package