PATH fixes
array expansion correct