Added snapshot and some other small changes