Fixed some issues, added delete