Fixed console problem with ultisnips mod - several other small tweaks.