Updates, clean-up and all important Firefly quote.