Add emitting to config
Bugfixes