addressed a several issues raised in the PR