updates to latest nimsdata master