Firefly - enough for now, small fixes