rename variables
general updates