updates to get comments working again