fix a few different buggies
Merge branch 'v3' of github.com:maxtaco/oneshallpass into v3