Feature/docs corrections

I think we should avoid talking about future features here.