close some bugs