Updating scripts for more contextual comments