A bit more linting.
Variable name changes in interface.py.
Merge branch 'fixing'