fixed IndentWithI, integrated more snippets