fixed priorities and cleaded up RequirementModel code