Added wpa/wpa2 support and spelling correction