describe: improved API/code, updated tests