a few minor fixes and a new test-case