Gabor fixes
pep8, cleanups