Stage tweaks
Merge branch 'master' of https://github.com/picoriley/cloaked-octo-bugfixes