Minor client-side refactoring and upgrade of libraries.