Fix the order and URL
Improve self-monitoring.