Update snippets
Fine tune logging