monitoring: improvements