Did my own phabricator comments; mostly small touches