adjusting some bugs