Fixed monitor update, and applied other comments.