Fixes (Konrad review #2); pep8, exceptions