final debugging / fix push for internal review