various changes from meeting 1