Use Unqual
Make needles const
Fix comment