Use no-ff option, and fix indentation