Fix #185 and #186

This corrects some small bugs and omissions.
Renaming `snapshot_name` to `snap` in this method to prevent a collision with `kwarg['snapshot_name']`.