asd
Various fixes
Merge branch 'v0.7' of github.com:dpawatts/zeus into v0.7