WLS: Lots of little tweaks.