A burst of productivity

Too many changes to count.