minor chages and 2 problems