fixed found issues