fix default value
fix wrong getter
split in variables