some list sorted, var-quoting changed (ws), deps morelined