Make the # of trump more important
Add in strong suit factor