draw: clear up remaining uses of $ and address all hints