Improved fitting performance, added more user configuration options