tweaking doc, test, etc