fix some bugs

I fix some bus I mentioned in my first pull request