Added tabular, fixed some snippets