Commented on review r/1111
Continued review of r/2221
Fixed issue_s_