mostly layout changes, some corrections