dokuh fix & simplelist cleanup