cleaning up sets
Merge branch 'master_inc'
fully enabling check for courser's roll
adding a lot more STP to my default WS set for testing