corrected some problemes in resolving