fixes for block settings; a bunch of other fixes