fixes and tweaks for 2.1