More monitoring features. Tidy after uninstall