fixed formats
fixed settings names