Minor improvments to parsing
Make actual docstrings