more tweaks for version 2.1