Docstrings edited
Attributes etc reorganized