Concerning improvements on the source material: if you haven't already done so, you may want to sprinkle in quite a few guard rails and parapets.