add various tweaks

Change-Id: I12d3d9c0238f2a68c347a5a5f85d86d93fd68031