don't rename properly named files again; other misc fixes