Cleaned up style issues. Fixed the integration tests.
Optimizations and bug fixes.
Added code review comments.
Fixed some pep8 issues.