first try to fix various things related to comments on pr :)