Post 1.04 tidyup sf

Various fixes and additions , within the post-1.04 milestone