We Can Rebuild It

I've been reviewing the whole run of "Nothing Like the Sun"/"Kingdom of the Wicked" over the past few weeks, thinking about some problems & possible fixes:

( house cleaning )