incorporate format in GUI
small clean up
Merge branch 'nocdc' of https://github.com/kristofvl/HedgeHog into nocdc