added freeze to some constants and little fix