bugfix in main, SFQ some changes