fixing a few things for production