Follow up from review. Almost exclusively comments added