Updated and fixed production bugs