bugfixes deleting and adding remove fields more