many changes in order to get comments working