(feat): various changes with production data and frontend changes