Major update, fixed docstrings