fixing issues from github