merging addIssue
fixing  some bugs