Added recent updates and fixes from Emmet core