Updates
Fixed bug with deleting
Code cleanup