Adding verbose options to Snapshot and minor details on other classes