Change configuration parameters, fix some bugs, update documentation