Style tweaks, wg updates