More demo shell script fixups and using bin dir