minor fixes
Merge branch 'devGUI' into PySide