remove unused aliased, add vim tag highlight and more minor changes
fix conflicts