fixed some of the issues mentioned in the review