Better rendering of narrow gauges, additional narrow gauges, clean-up