fixiing some stuff