Update defaults and rename variables
Update documentation