Updates: tables structure, refs to figures, some corrections, future work