Mostly documentation update but some code clarification too.