fix & deletions