misc cleanup and graphic
Merge branch 'master' of https://github.com/Sheridan/contrib
Merge branch 'master' of github.com:Sheridan/contrib