emmet and other fixes