Fix bug with spaces in strings
Fix deleting error
Add comments