updated to -16 from MBJ, added metadata and management as separate drafts