emmet and a few fixes