fixed everything to work in production