Fixes issues. Adds delete