Doc draft and small fix