clean up
tweak firesource