Adding comments and tracking info