would be good to enable an entire check rather than doing here-and-there fixes