add verbose switch for emit
some cleanups