adding the the final do-it-live tweaks
Merge branch 'last-minute-tweaks'