Fixed a crash and a freeze in angeld
Many minor tweaks
Merge branch 'master' of https://github.com/kevinriehm/evt-black-box