yasnippet + minor changes