Resolved metadata confusions and de-crappified Project 2.