bug fixes to properly add beacons for monitoring