7.30 ver

fix a lot of bugs