resolved 20 issues as per client