remove some bugs, actually tones of bugs :D