tweaks to work across more systems
Merge branch 'rework'