Add UpdateUniform, Fix Market