Add bugpack context to a few files. Update comments.