minor tone reorg, ios/ffox fix
Merge branch 'master' of https://github.com/baxrob/patr