fact-based issues and minor sense optimizations