Let le fil à soi work with the new code

Merged features and added flags in settings to enable/disable.