Huge update and cleanup

Too many things to describe, try it instead ;)
Remove unused attribute
Merge remote-tracking branch 'upstream/jb43' into jb43
Merge branch 'jb43' of https://github.com/TaoSP/HALO into jb43