general 3->2 fixes + other improvements