#19 more work on metadata