ess align and small changes