Issue #22. Also some effort to reduce monitor metrics.