Plus various bug fixes from flight testing