lots of copy additions, layout changes