merge w/ 2.0.B7 + minor tweaks