almost all fixes for prod