a couple of bugs fixed and a couple more found ...