improve layout and minor corrections