Minor touchups
Minor touchups