Extra comments and renamings