fixxing some old bugs