closing some bugs