Move heat shields, revise R&D costs to 20x

Also fix some comment positioning.