finalized delete
redactoring
redactoring 2
some refactoring, still some bugs