many small changes to reflect new mock-ups received from TBS