lots of small tweaks
Merge remote-tracking branch 'upstream/master'

Conflicts:
	bin/workhorse.sh
	start.sh