added handling for comments