Cleanup of minor violations, updated some dependencies to latest version.