Added auto-complete; more yasnippet