0.2.17  More tweaks and fixes.