Fixes misc. things we noticed while working on the presentation
Merge branch 'master' of https://github.com/GrahamCrackers42/ZERO-Beacon