Minor cleanups, added Metadata module.