esize and minor changes