sf36 first steps
misc stuff
added SF12 testing
sf36 and tests
misc fixes