Bug fixed 1,2 and 4 issues from github.