progress on comments implementation