Docstrings

finally merged master again.

In my branch I had added quite a bit of docstrings that I added while reading code, in case you want them, you can merge this PR (obviously I'd like that because it'll give me fewer merge conflicts in the future).