more tests, suggested changes, and a caveat!