Fix errors, add experimental settings