style improvements
Merge branch 'graphing' into graphing+double-management