fixes for comments