Re implemented Delete and another fixes.