removing some bugs