Recent updates to the windshaft branch