Issue #242, some additional info cleaning up