Cleanup, tea, & brass wing tweaks