fixing some probs