Fixed issue where snapshot files don't get a timestamp when they are created
Fixed indentation
Fixed escaping