fixing metadata closes #23, closes #29