update code and github to our current ones