first attempt at some improvements to mobile broadband handling