Signal strength: add more checks to signal strength,