updated composite risk calculation
reordered some fields, and renamed composite risk rating