Add some more whitespace and parens tweaks
Add snippet support
Add some more formatting capabilities and rearrange