General updates, revised first word search