Update to new-style class inheritance, add docstrings + some comments