Better guioptions and fix for UltiSnips change.