Added delete support and various other improvements.