concert master dependencies set correctly.
trivial pep8 fixes.
merged fixes.