fix some more stuff

fix some more stuff and more debug info