Fixes for the update and also more PEP8 corrections.