resolved many issues