Added firefly-specific additions, changes.