Add more docs, shift methods around a little

Another attempt at fix for #47