Final tweaks for fresh install .....