Fixed a few items and made deleting smart