Fix bug introduced when tagging child exec by their parent
Housekeeping
Clean up comments