various changes
Merge branch 'master' of github.com:terminalcloud/apps