Some more improvements based on colemak, but taking attention to workman and norman style metrics.