add rest of working changes for demo
Merge branch 'master' of https://github.com/pb2au/hidden-machine