fixed more properties