some progress on comments
comments done