Couple tweaks, more needed.