refactoring what of monitor there is. A few corrections elsewhere.