Added signal strength & fixed out of range issues