Sync of Stu's latest changes post CQP 2012