improve documentation and internal consistency
decascade test bootstrap