a few more tweaks for 0.9.20 release