fix for wifi and camera
and some minor tweaks