Improved words detection