Added snapshot and fixed multi-argument commands.