Add comments, update filters