Fixed loadEmmet
Various updates