comments, cleanings fixes