delection and fixes