renames and a few comments