na - continued refactoring and improving the metadata stuff