Docstrings cleaned up a bit, most code review comments addressed