adding comments, tuning