fixxing some stuff