Added experimental deletion code, added more toString() calls