comment clarity and fixes