Refactor wing interactions, remove some nasty errors