rename variables and properties
fixing bugs