Fix default and expand docs
wip