Fixed delete, did some other stuff