detection enhancements
fixes