Updates for JWK, minor bugfixes.