Upgrade to wai 3.0 and fix some lint and style