#39, #41 + amlioration des snippets