emmet improvements and additional fixes