cleanup; fixed some probs