Bug Fixes/Added Snapshot Feature