- Suppress messages in diagram2.R
- Minor bug fixes