fixed vim html bug; other fixes