Smaller fixes.
Merge branch 'master' of github.com:wiredearp/spiritual-gui