cleaned up dairies states, and added fields to form