uaf-7 and squark; fix vim-commentary