upstream fixes for sf2.2
layout changes
some fixes