added and resolved isssues