adding fixes for comments