pletted some bugs