More docs and rearranged more logically