Fixed Delete Node + Some interface changes