Fixed some probs