Modify some default options
Update documentation