Updated post TA meeting

Incorporated many changes after TA discussion.