fix issues on github
more fixes on github