Change: enable wifi for scan; bug fixes