better parsing,fixed flair bug