Fix bugs; change boundary characters