updates/edits for the ICCSA 2014 talk