added wifi, minor adjustments