Add more metadata, rationalize tags


