Imrpove docs
WIP