Cleaned up diagnostics and a little bit home
Merge
Merge
Merge
Merge branch 'master' of https://github.com/tinchoforever/hipo