coverage tool and minor tweaks