tweaks per Dave
2 files changed