WAI update

minor fixes and tweaks