First Round of Comment Clean-ups

some state name changes in the find state