Cleanup. Bug fixes.
Cleanup. Pep8