fixed some issues in production