Corrections and wifi fixes