more tweaks for firefly