New graph rendering.
Code cleanup & style update.
Merge branch 'master' of github.com:jellea/---