Minor cleanups
Fix package definition, put emitter before html
Add utils
Some fixes and additions