First round of tweaks lots of mobile stuff