Enhanced output. Fixes #87 and fixes #104.