small fixes + start of meta+data input