Updated the draft; mostly notation fixes