build update to the latest versions

... and some whitespace cleanup ...