Improving documentation adding some todo notes