Adding comments, making sure contexts get trimmed