updated specs, updated string matching