remove freeze, improve toStdClass