3.1 updates

Here is a bunch of updates that has been done for a SS 3.1 project