metadata refactoring
test fixes
oversync fixes