Overview tidyup sf 2 may

Additional changes that didnt make it to 1.04