reorganize, document, tune defaults