reorganize emblems & add a bunch of new ones
remove console.log statements and other small tweaks