f discovery major bugs fixed