bug fixes from the string update