PEP8 fixes, new docstrings and TODOs