Add dataset approval and several bugfixes