organization changes in smarts_check and updates to some smart strings