get rid of some bugs