Yeah Wow Hey: hotfix

fix some bugs