Tweak classes, add a few docstrings