first pass of Wan-Teh's comments
use uniform spacing