Fixes (Konrad review #1); pep8, exceptions