Inserts fixed, delete mostly works...fix infrequent null pointer