Update to discussion
Updated discussions, corrected references