Rearranged/added more docs