Update to latest dependency versions
Minor whitespace fixes