cleanup: generalize Str of Stone patches
removed unnecessary copy
wings code cleanup
sunscorch pt. 1