some fixups from adw
Merge branch 'master' of https://github.com/gotbingo/phis
Merge branch 'master' of https://github.com/gotbingo/phis
Merge branch 'master' of https://github.com/gotbingo/phis
sc
Merge branch 'master' of https://github.com/gotbingo/phis
Merge branch 'master' of https://github.com/gotbingo/phis
on the run