renames, smaller fixes