fixed propery names and assignment