improve var names in battery
add wifi