increased to 10000 servings and some cleanup