Few more tweaks, running fine under 1.6.1 now with minimal testing.