implementing delete + fixes