worked on some comments