Some fixes based on pull request feedback
One other minor fix
Merge pull request #16 from Mike-GC/safestreamdeletion

Minor Fixes