Further tweaks to schema, updated to incorporate PDOs better, hopefully
will actually run soon