Added more docs and improvements to it [skip ci]