Adjustments to use shared versions of common libraries.
Minor spacing changes