Add net80211 and minor cleanup.