Move ells out of (draw) loop. Minor fixes elsewhere.